From: Kim F. Storm <storm@cua.dk>
Date: Mon, 26 Apr 2004 22:05:15 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22912
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d276ea27c5a2abcb8dab277a9374c8b1f476955c;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 953abb844f6..1ff74e05836 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-27  Kim F. Storm  <storm@cua.dk>
+
+	* xdisp.c (Qline_height): New variable.
+	(syms_of_xdisp): Intern and staticpro it.
+	(append_space_for_newline): Partially undo 2004-04-25 change;
+	add default_face_p arg, and restore callers.
+	Clear it->use_default_face after use.
+	(x_produce_glyphs): Set default font for ascii char if
+	it->use_default_font is set.  Change line-spacing property to set
+	just extra line spacing.  Handle new line-height property.
+
 2004-04-26  Andreas Schwab  <schwab@suse.de>
 
 	* print.c (print_object): Print non-ascii characters in bool
@@ -11,7 +22,7 @@
 	* data.c (Faref, Faset): Likewise.
 	* fns.c (Fcopy_sequence, concat, internal_equal, Ffillarray)
 	(mapcar1): Likewise.
-	
+
 2004-04-26  Steven Tamm  <tamm@Steven-Tamms-Computer.local>
 
 	* lread.c (init_lread): Fixing typo HAVE_CARBON test logic